[LLDB] Add log channel for InstrumentationRuntime plugins #168508
Merged
+9
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
@llvm/pr-subscribers-lldb Author: Dan Liew (delcypher) ChangesThis patch adds A small use of the channel is added to illustrate its use. The logging added is not intended to be comprehensive. This is primarily motivated by an rdar://164920875 Full diff: https://github.com/llvm/llvm-project/pull/168508.diff 3 Files Affected:
diff --git a/lldb/include/lldb/Utility/LLDBLog.h b/lldb/include/lldb/Utility/LLDBLog.h
index 18e4a3ca73507..ac360bfdf8cee 100644
--- a/lldb/include/lldb/Utility/LLDBLog.h
+++ b/lldb/include/lldb/Utility/LLDBLog.h
@@ -50,7 +50,8 @@ enum class LLDBLog : Log::MaskType {
OnDemand = Log::ChannelFlag<31>,
Source = Log::ChannelFlag<32>,
Disassembler = Log::ChannelFlag<33>,
- LLVM_MARK_AS_BITMASK_ENUM(Disassembler),
+ InstrumentationRuntime = Log::ChannelFlag<34>,
+ LLVM_MARK_AS_BITMASK_ENUM(InstrumentationRuntime),
};
LLVM_ENABLE_BITMASK_ENUMS_IN_NAMESPACE();
diff --git a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp
index 38c334bfb78ac..8b3702335d012 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp
@@ -199,6 +199,7 @@ bool ReportRetriever::NotifyBreakpointHit(ProcessSP process_sp,
StoppointCallbackContext *context,
user_id_t break_id,
user_id_t break_loc_id) {
+ auto *log = GetLog(LLDBLog::InstrumentationRuntime);
// Make sure this is the right process
if (!process_sp || process_sp != context->exe_ctx_ref.GetProcessSP())
return false;
@@ -207,8 +208,10 @@ bool ReportRetriever::NotifyBreakpointHit(ProcessSP process_sp,
return false;
StructuredData::ObjectSP report = RetrieveReportData(process_sp);
- if (!report || report->GetType() != lldb::eStructuredDataTypeDictionary)
+ if (!report || report->GetType() != lldb::eStructuredDataTypeDictionary) {
+ LLDB_LOGF(log, "ReportRetriever::RetrieveReportData() failed");
return false;
+ }
std::string description = FormatDescription(report);
diff --git a/lldb/source/Utility/LLDBLog.cpp b/lldb/source/Utility/LLDBLog.cpp
index 613dae42064a8..a08764d84edd2 100644
--- a/lldb/source/Utility/LLDBLog.cpp
+++ b/lldb/source/Utility/LLDBLog.cpp
@@ -67,6 +67,9 @@ static constexpr Log::Category g_categories[] = {
{{"disassembler"},
{"log disassembler related activities"},
LLDBLog::Disassembler},
+ {{"instrumentation-runtime"},
+ {"log instrumentation runtime plugin related activities"},
+ LLDBLog::InstrumentationRuntime},
};
static Log::Channel g_log_channel(g_categories,
|
🐧 Linux x64 Test Results
|
Michael137
reviewed
Nov 18, 2025
lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.cpp
Outdated
Show resolved
Hide resolved
Michael137
approved these changes
Nov 18, 2025
Member
Michael137
left a comment
Michael137
left a comment
There was a problem hiding this comment.
Makes sense
Surprised we haven't logged anything from InstrumentationRuntime before
JDevlieghere
approved these changes
Nov 18, 2025
Member
JDevlieghere
left a comment
JDevlieghere
left a comment
There was a problem hiding this comment.
LGTM with Michael's comment addressed.
Collaborator
|
LGTM also. |
medismailben
approved these changes
Nov 18, 2025
delcypher
force-pushed
the
dliew/lldb-instrumentation-plugin-log-handle
branch
from
94f1518 to
40e7cf2
Compare
This patch adds `LLDBLog::InstrumentationRuntime` as a log channel to provide an appropriate channel for instrumentation runtime plugins as previously one did not exist. A small use of the channel is added to illustrate its use. The logging added is not intended to be comprehensive. This is primarily motivated by an `-fbounds-safety` instrumentation plugin (swiftlang#11835). rdar://164920875
delcypher
force-pushed
the
dliew/lldb-instrumentation-plugin-log-handle
branch
from
40e7cf2 to
c8cffb1
Compare
delcypher
added a commit
to delcypher/apple-llvm-project
that referenced
this pull request
Nov 18, 2025
This patch adds `LLDBLog::InstrumentationRuntime` as a log channel to provide an appropriate channel for instrumentation runtime plugins as previously one did not exist. A small use of the channel is added to illustrate its use. The logging added is not intended to be comprehensive. This is primarily motivated by an `-fbounds-safety` instrumentation plugin (swiftlang#11835). rdar://164920875 (cherry picked from commit 46565f3)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch adds
LLDBLog::InstrumentationRuntimeas a log channel to provide an appropriate channel for instrumentation runtime plugins as previously one did not exist.A small use of the channel is added to illustrate its use. The logging added is not intended to be comprehensive.
This is primarily motivated by an
-fbounds-safetyinstrumentation plugin (swiftlang#11835).rdar://164920875